Better reccognition of unknown alt in lowranceusr.

diff --git a/lowranceusr.c b/lowranceusr.c
index dd5ebbb960f104ecc4549fe5bcb19965d3a4c3b4..aa86be9e057d8526850ea46f9e57a0fd615bd77b 100644 (file)
--- a/lowranceusr.c
+++ b/lowranceusr.c
@@ -360,7 +360,7 @@ lowranceusr_parse_waypt(waypoint *wpt_tmp)
        wpt_tmp->latitude = lat_mm_to_deg(gbfgetint32(file_in));
        wpt_tmp->longitude = lon_mm_to_deg(gbfgetint32(file_in));
        wpt_tmp->altitude = FEET_TO_METERS(gbfgetint32(file_in));
-       if (wpt_tmp->altitude <= UNKNOWN_USR_ALTITUDE) {
+       if (METERS_TO_FEET(wpt_tmp->altitude) <= -10000) {
                wpt_tmp->altitude = unknown_alt;
        }
 

diff --git a/reference/lowrance-v2-unicsv.txt b/reference/lowrance-v2-unicsv.txt
index d0eb8e8620cb63f6404a8766d74aff3301c18b32..cec574e937fb7a34fca6448ad96a43b989b7766f 100644 (file)
--- a/reference/lowrance-v2-unicsv.txt
+++ b/reference/lowrance-v2-unicsv.txt
@@ -60,11 +60,11 @@ No,Latitude,Longitude,Name,Altitude,Symbol,Date,Time
 59,42.388913,-82.894047,"014",174.0,"diamond 1",2008/06/20,17:16:39\r
 60,42.409493,-82.881329,"015",176.5,"diamond 1",2008/06/20,17:51:04\r
 61,42.410478,-82.881374,"016",176.8,"diamond 1",2008/06/20,18:06:07\r
-62,42.411104,-82.880527,"017",-3048.0,"diamond 1",2008/06/20,18:16:10\r
+62,42.411104,-82.880527,"017",,"diamond 1",2008/06/20,18:16:10\r
 63,42.382415,-82.900131,"018",172.2,"diamond 1",2008/06/21,15:10:10\r
-64,42.380771,-82.899347,"019",-3048.0,"diamond 1",2008/06/21,15:57:22\r
-65,42.413326,-82.879121,"020",-3048.0,"diamond 1",2008/06/21,18:03:09\r
+64,42.380771,-82.899347,"019",,"diamond 1",2008/06/21,15:57:22\r
+65,42.413326,-82.879121,"020",,"diamond 1",2008/06/21,18:03:09\r
 66,42.378553,-82.900104,"021",173.1,"diamond 1",2008/06/21,19:38:08\r
-67,42.950009,-85.607586,"012",-3048.0,"diamond 1",2008/06/28,19:01:28\r
+67,42.950009,-85.607586,"012",,"diamond 1",2008/06/28,19:01:28\r
 68,41.413022,-85.724372,"Icon 1",0.0,"diamond 1",,\r
 69,41.413035,-85.724399,"Icon 2",0.0,"diamond 1",,\r

diff --git a/reference/lowrance-v3-unicsv.txt b/reference/lowrance-v3-unicsv.txt
index 6a22a1ea7a98f1dc7344e78dc7cdf64292549d6a..2dd2b4c1d0bca31e2eb4739590e0fa749893e4f0 100644 (file)
--- a/reference/lowrance-v3-unicsv.txt
+++ b/reference/lowrance-v3-unicsv.txt
@@ -60,11 +60,11 @@ No,Latitude,Longitude,Name,Altitude,Symbol,Depth,Date,Time
 59,42.388913,-82.894047,"014",174.0,"diamond 1",1.2,2008/06/20,17:16:39\r
 60,42.409493,-82.881329,"015",176.5,"diamond 1",1.8,2008/06/20,17:51:04\r
 61,42.410478,-82.881374,"016",176.8,"diamond 1",1.4,2008/06/20,18:06:07\r
-62,42.411104,-82.880527,"017",-3048.0,"diamond 1",,2008/06/20,18:16:10\r
+62,42.411104,-82.880527,"017",,"diamond 1",,2008/06/20,18:16:10\r
 63,42.382415,-82.900131,"018",172.2,"diamond 1",1.0,2008/06/21,15:10:10\r
-64,42.380771,-82.899347,"019",-3048.0,"diamond 1",,2008/06/21,15:57:22\r
-65,42.413326,-82.879121,"020",-3048.0,"diamond 1",,2008/06/21,18:03:09\r
+64,42.380771,-82.899347,"019",,"diamond 1",,2008/06/21,15:57:22\r
+65,42.413326,-82.879121,"020",,"diamond 1",,2008/06/21,18:03:09\r
 66,42.378553,-82.900104,"021",173.1,"diamond 1",2.2,2008/06/21,19:38:08\r
-67,42.950009,-85.607586,"012",-3048.0,"diamond 1",,2008/06/28,19:01:28\r
+67,42.950009,-85.607586,"012",,"diamond 1",,2008/06/28,19:01:28\r
 68,41.413022,-85.724372,"Icon 1",0.0,"diamond 1",,,\r
 69,41.413035,-85.724399,"Icon 2",0.0,"diamond 1",,,\r